From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 7 Feb 2022 13:09:13 +0000 (+0100)
Subject: ci: Stop prohibiting template strings in files with translations
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~530^2^2~46
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3973c84e97854a791a6d4ba5e3cfe173cfbbdc8c;p=gnome-shell.git

ci: Stop prohibiting template strings in files with translations

It has been nearly two years since the last regression reported in
https://savannah.gnu.org/bugs/?func=detailitem&item_id=50920 has been
fixed, and no further regressions were reported in the meantime.

It looks therefore safe enough to not restrict ourselves, and start
allowing templates for all non-translatable strings again.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2160>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25d44827f..e0b6bcd0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -182,14 +182,6 @@ potfile_js_check:
   script:
     - js91 -m .gitlab-ci/check-potfiles.js
 
-no_template_check:
-  extends:
-    - .fdo.distribution-image@fedora
-    - .gnome-shell.fedora:35
-  stage: review
-  script:
-    - ./.gitlab-ci/check-template-strings.sh
-
 build:
   stage: build
   needs: ["check_commit_log"]
diff --git a/.gitlab-ci/check-template-strings.sh b/.gitlab-ci/check-template-strings.sh
deleted file mode 100755
index efa8afc1f..000000000
--- a/.gitlab-ci/check-template-strings.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# find files from POTFILES.in that use js template strings
-baddies=$(grep -l '${' $(grep ^js po/POTFILES.in))
-
-if [ ${#baddies} -eq 0 ]; then
-  exit 0
-fi
-
-cat >&2 <<EOT
-
-xgettext cannot handle template strings properly, so we ban their use
-in files with translatable strings.
-
-The following files are listed in po/POTFILES.in and use template strings:
-
-EOT
-for f in $baddies; do
-  echo "  $f" >&2
-done
-echo >&2
-
-exit 1